Git merge --continue

git status On branch cat You have unmerged paths. (fix conflicts and run "git commit") (use "git ...

如果用之前提過的merge方式去合併(在master上用指令git merge iss2) ... git rebase --continue Applying: start fix iss2 ...

Use git commit or git merge --continue to seal the deal. The latter command checks whether there ...

警告： git merge 不鼓励使用不平凡的未提交更改：尽管可能，但可能会让您处于难以在冲突情况下退出的状态。 第四种语法（“ git merge --continue ...